From: Michael Gilbert Date: Sun, 13 Mar 2022 04:27:41 +0000 (+0000) Subject: fix uninitialized variable compiler warnings X-Git-Tag: archive/raspbian/7.0_repack-10+rpi1~4^2 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=b609e96ac83f855cbbe739ba36f156c66d32a726;p=wine.git fix uninitialized variable compiler warnings Gbp-Pq: Topic warnings Gbp-Pq: Name uninitialized-variables.patch --- diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 0ada09a..cc4d30c 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -238,7 +238,7 @@ static BOOL get_config_key_dword(HKEY hkey, const WCHAR *name, DWORD *value) static BOOL get_config_key_string(HKEY hkey, const WCHAR *name, WCHAR **value) { - DWORD type, size; + DWORD type, size = 0; WCHAR *str; if (RegQueryValueExW(hkey, name, 0, &type, NULL, &size)) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 8f7c926..3948960 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -5524,7 +5524,8 @@ static BOOL attempt_line_merge(struct outline *outline, BOOL to_curve, const struct cos_table *table) { - D3DXVECTOR2 curdir, lastdir; + D3DXVECTOR2 curdir = {0.0f, 0.0f}; + D3DXVECTOR2 lastdir = {0.0f, 0.0f}; struct point2d *prevpt, *pt; BOOL ret = FALSE; diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 376b97f..7033972 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1112,7 +1112,6 @@ static UINT set(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, if (inclass == D3DXPC_MATRIX_ROWS && desc->RegisterSet == D3DXRS_BOOL) { D3DXMATRIX mat, *m, min; - D3DXMatrixTranspose(&mat, &min); if (is_pointer) min = *(D3DXMATRIX *)(indata[index / 16]); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 6af4458..b099f17 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1269,7 +1269,7 @@ static inline void fill_texture(const struct pixel_format_desc *format, BYTE *po for (c = 0; c < 4; c++) { - float comp_value; + float comp_value = 0.f; DWORD i, v = 0, mask32 = format->bits[c] == 32 ? ~0U : ((1 << format->bits[c]) - 1); switch (c) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 33f9fde..b703922 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -247,9 +247,9 @@ static DWORD MIDI_mciReadNextEvent(WINE_MCIMIDI* wmm, MCI_MIDITRACK* mmt) { BYTE b1, b2 = 0, b3; WORD hw = 0; - DWORD evtPulse; + DWORD evtPulse = 0; DWORD evtLength; - DWORD tmp; + DWORD tmp = 0; if (mmioSeek(wmm->hFile, mmt->dwIndex, SEEK_SET) != mmt->dwIndex) { WARN("Can't seek at %08X\n", mmt->dwIndex); diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 1a7439a..560fca4 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -610,7 +610,7 @@ static void session_clear_topologies(struct media_session *session) static void session_set_topo_status(struct media_session *session, HRESULT status, MF_TOPOSTATUS topo_status) { - IMFMediaEvent *event; + IMFMediaEvent *event = NULL; PROPVARIANT param; if (topo_status == MF_TOPOSTATUS_INVALID) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 80d6b8a..9de330e 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1818,7 +1818,7 @@ static HRESULT InstallerImpl_SummaryInformation(WORD wFlags, UINT ret; HRESULT hr; MSIHANDLE hsuminfo; - IDispatch *dispatch; + IDispatch *dispatch = NULL; VARIANTARG varg0, varg1; if (!(wFlags & DISPATCH_PROPERTYGET)) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 5ea1ddf..7841fc9 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -269,7 +269,7 @@ static void small_sort(void *base, size_t nmemb, size_t size, int (CDECL *compar)(void *, const void *, const void *), void *context) { size_t e, i; - char *max, *p; + char *max, *p = NULL; for(e=nmemb; e>1; e--) { max = base; diff --git a/dlls/msxml3/xdr.c b/dlls/msxml3/xdr.c index b5e91bc..fb56867 100644 --- a/dlls/msxml3/xdr.c +++ b/dlls/msxml3/xdr.c @@ -603,6 +603,9 @@ static xmlNodePtr XDR_E_ElementType(xmlNodePtr xdr, xmlNodePtr parent) case ORDER_ONE: xsd_child = xmlNewChild(xsd_base, NULL, xs_all, NULL); break; + default: + xsd_child = NULL; + ERR("Unhandled order enum %d\n", (int)order); } FOREACH_CHILD(xdr, xdr_child) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 3979f41..6169603 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -1937,7 +1937,7 @@ NTSTATUS WINAPI RtlIdnToUnicode( DWORD flags, const WCHAR *src, INT srclen, WCHA int i, buflen, start, end, out_label, out = 0; NTSTATUS status; UINT buffer[64]; - WCHAR ch; + WCHAR ch = '\0'; if (!src || srclen < -1) return STATUS_INVALID_PARAMETER; if (srclen == -1) srclen = wcslen( src ) + 1; diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index a536f82..550a33a 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2517,7 +2517,7 @@ static HRESULT WINAPI DataCache_EnumCache(IOleCache2 *iface, DataCacheEntry *cache_entry; int i = 0, count = 0; STATDATA *data; - HRESULT hr; + HRESULT hr = E_FAIL; TRACE( "(%p, %p)\n", This, enum_stat ); diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 8b45704..92150ab 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1679,7 +1679,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_GETNONCLIENTMETRICS: { LPNONCLIENTMETRICSW lpnm = pvParam; - int padded_border; + int padded_border = 0; if (!pvParam) return FALSE; diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index ffa789f..aa85e4c 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2041,7 +2041,7 @@ static inline BOOL is_element_type( unsigned char type ) static HRESULT read_attributes_bin( struct reader *reader, WS_XML_ELEMENT_NODE *elem ) { - WS_XML_ATTRIBUTE *attr; + WS_XML_ATTRIBUTE *attr = NULL; unsigned char type; HRESULT hr; @@ -6417,7 +6417,7 @@ static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { ULONG i, offset; - HRESULT hr; + HRESULT hr = E_FAIL; char *buf; if (!desc) return E_INVALIDARG; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index dc5bf37..8680920 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2605,6 +2605,9 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for case WINED3D_GL_RES_TYPE_COUNT: color = 0; break; + default: + color = 0; + ERR("Unhandled type enum %d\n", (int)type); } checkGLcall("Post-pixelshader blending check"); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index bd25ec5..7bb8ff8 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -182,8 +182,11 @@ static int func_cmp( const void *func1, const void *func2 ) { const ORDDEF *odp1 = *(const ORDDEF * const *)func1; const ORDDEF *odp2 = *(const ORDDEF * const *)func2; - return strcmp( odp1->name ? odp1->name : odp1->export_name, - odp2->name ? odp2->name : odp2->export_name ); + const char *name1 = odp1->name ? odp1->name : odp1->export_name; + const char *name2 = odp2->name ? odp2->name : odp2->export_name; + if ( !name1 || !name2 ) + fatal_error("Unable to compare function names\n"); + return strcmp( name1, name2 ); } /* remove a name from a name table */ diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 6843f89..88a7c99 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -282,7 +282,7 @@ static void do_field(const unsigned char* start, const unsigned char* end) const unsigned char* ptr = start; const char* cstr; const struct p_string* pstr; - int leaf_len, value; + int leaf_len, value = 0; while (ptr < end) { @@ -574,7 +574,7 @@ static void do_field(const unsigned char* start, const unsigned char* end) static void codeview_dump_one_type(unsigned curr_type, const union codeview_type* type) { const union codeview_reftype* reftype = (const union codeview_reftype*)type; - int i, leaf_len, value; + int i, leaf_len, value = 0; unsigned int j; const char* str;